remove <<<<<<<

diff --git a/ChangeLog b/ChangeLog
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fe8b09c5d53ac38dc77d5c0f8e16789a34f704a5..82603314e97611cab5c1bcffa63a7545ea848244 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -84,7 +84,6 @@ Sat Dec  8 20:57:24 2001  Kristian Rietveld  <kristian@planet.nl>
        * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++,
        per jrb's request
 
->>>>>>> 1.2684
 2001-12-08  Anders Carlsson  <andersca@gnu.org>
 
        * tests/testgtk.c (layout_expose_handler): Don't return TRUE